Fix cross references in docs in tarballs

This approach is copied from Pango.

diff --git a/Makefile.am b/Makefile.am
index d689b3fbac4db52ec4d0109605e8f10279ae9194..3d9d80b74afad629aa5648b7e62558c5cb6a4f32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -124,6 +124,7 @@ snapshot:
 
 DISTCHECK_CONFIGURE_FLAGS =            \
        --enable-gtk-doc                \
+       --disable-doc-cross-references  \
        --enable-man                    \
        --disable-maintainer-mode       \
        --enable-introspection          \

diff --git a/configure.ac b/configure.ac
index 58cc3e38e266d8c2b0224ea37454e8669351d308..733f50bb496beb5f174cf88aa95c644d5d52ef0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1724,6 +1724,16 @@ else
   AC_MSG_RESULT([no])
 fi
 
+AC_ARG_ENABLE(doc-cross-references,
+              AC_HELP_STRING([--disable-doc-cross-references],
+                             [cross reference symbols from other libraries @<:@default=yes@:>@]),
+              enable_doc_cross_references=$enableval,
+              enable_doc_cross_references=yes)
+
+AM_CONDITIONAL(ENABLE_DOC_CROSS_REFERENCES, test x$enable_doc_cross_references != xno)
+
+
+
 ##################################################
 # Visibility handling
 ##################################################

diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index f19ae8cb7df0dc88adf3c263841ee6f1af0e66b4..61f9447db828cb191e80ed2c3db700fc3c5125d4 100644 (file)
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -135,12 +135,13 @@ HTML_IMAGES =                             \
        images/watch.png                \
        images/xterm.png
 
+if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS= \
        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
        --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-
+endif
 
 include $(top_srcdir)/gtk-doc.make
 

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index f0eeabb7dbdfdac2837ca3a63f6f343ab2428c45..968384c13691092d9bac2b7c2c33e18d46e5146d 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -315,6 +315,7 @@ HTML_IMAGES = \
        $(srcdir)/images/flow-box.png                                   \
        $(srcdir)/images/inspector.png
 
+if ENABLE_DOC_CROSS_REFERENCES
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk/html \
        --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
@@ -323,6 +324,7 @@ FIXXREF_OPTIONS=--extra-dir=../gdk/html \
        --extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
        --extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
        --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+endif
 
 include $(top_srcdir)/gtk-doc.make